incomplete refactoring of some selectors and callbacks into FormControl instances
resolved bugs introduced by refactoring FormControl