Moved the generic filters to its own seperate header.