added country id in all filters