finish off most of the filter/search functions