Fixed Advanced/Custom Search issue with search criteria