Bookmarks handling improvements/optimization

Great performance improvements with many bookmarks, some code simplification. 
To test try to import a file with 5-10k bookmarks.
I decided not to merge bookmarkDict and bookmarks collection yet since it might break quite a lot of stuff.