fix: Invalid handling of id in foreach when using discovery components

fix: Invalid handling of id in foreach when using discovery components #1820