Added condition filter in search