modified select form to default value when available