New Feature (Additonal): Search Functionality

Updated changes that allow for proper implementation of Search Functionality