Fix n+1 query on Browse by City/County pages