Small performance improvement: bookmarks::check now also requires a query object to be passed, which then later is reused for other requests. This should improve network performance since really one connection to the server is made
Removed some warnings from Weffc++