Improved customer query