Stash search function in progress
Fix search functionality