Preparing back end filtering

Will remove front end filtering once it's done