Fixed empty content logic

- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message