Form, Select: bug fixes