Cleaning up else-filter declaration
Detemplatification of NewAutoFilter
Eliminating a hard-to-support duplication check