Issue #180 - Need to make sure we don't limit search queries
Merge branch 'issue180-max-query-setting' into develop