Added basic search filtering