EddieCurtis - Fixed search queries