[GAIA BUG946750-FORM] - nit fixes requested by :arcturus