Form.Search improvements