Added search filtering
Merge