Support for more addSpecial Query Modifiers

JAVA-1278

Not sure if adding support for `$query` is applicable or how it would be used.