Fixing bookmarks
Fixing filtering to use names displayed as well