Fixed references to old form helper service