Use only :image-id for template if specified

Stop other information in the template from preventing a match.