QueryOptions and QueryResult now are normal Java Beans instead of Maps. Removing
commented code from QueryOptions.