Refactored mongo query to flow directly from the generated object rather than bounce back and forth from String representation