fix: update form timer to handle groups

fix: update form timer to handle groups #17679