Updated filter with json