Made area queries more efficient