before nested change
running on azure with int IDs
minor cleanup
swap place form input