New Feature (Additonal): Search Functionality

Modified existing functions in order to have Search Functionality