Add short circuit for attribute equals queries