Improve genre filtering to show books in subgenres.
Merge branch 'better-genre-filtering' into develop