New Feature (Additonal): Search Functionality

Modified existing functions to allow for proper implementation of Search functionality