Updated wrong filter
Updated field and filter names to new names