small bug fixes with selecting form values