Changing most search fields to be single value