Fixed search setting not being fully considered