Work on queries overlay