Added some more filters on country and order state