data service get customer query bug fix