Issue #180 - Need to make sure we don't limit search queries