fix index display for hashtags and bookmarks
Refactor.
WIP