Better queries for home and map

not optimal but better. I don't really get why I did to not be able to
click on the book in the map