refactored query for customer
added FundooSolution's popup  service