Added locate and search