Clean up some filter related logic