added support for more query operators.