Added RegExp support for  queries