Added search keys feature