working through all filters and protecting some functions and cleaning up the checks on the data containers - Generic Filters DONE