Support for more addSpecial Query Modifiers

JAVA-1278