Further updates to get customer query