Added Search Functionality v1.1