before search filter fix