[#53475213] notes form cleanup and minor bugfix