Fix subscription filter matching on country + subscription result tweaks