Clean up and refactor some backend methods. Remove superfluous bool returns from delete methods
Merge branch 'master' into virtual_collection_rework
Move around bookmark-related templates