Adding countries to filters, fix json