fix filtering on front end
Merge branch 'update-filtering' into develop