Adde nicer query