Filtering with both genre and grade

When filtering map view with genre and grade, the results don’t meet expectation.

Expected behaviour: only show crags with climbs in the specified genre that meet the grade criteria.

Current behaviour: show all crags that meet any of the criteria, no matter if the climbs in the specified grade range are of a different genre. Eg. when searching for 7a> trad routes, receive results of crags with 7A boulders and a single 3 trad route