Fix Bookshelf results when a filter is set to more than one value
Do not display Bookshelf related image if it errors loading
Settings cleanup
Merge branch 'develop'