Update so that the category check will also take place
Update to include basic category check on filters and options