Overriding customer query - Alokai