Added better search filter.