Made query simpler