Fixed #1683 by making expanding search opt-in

Fixes #1683