Don't remove template options when using :image-id

Fixes issue introduced in c8ad1e3879c898b13a41e1ea94b33c360dcab31a