Add themes/cities filters
Fix jumpy visual bug when selecting a filter