Adds organization filter on site geographic_context_country_id
Adds category filter on site geographic_context_country_id
Merge branch 'staging' into dev