Removed field query (not in RC1)
Updated boolean query to accept full set of options