About my first comment: It should be possible to use IDs anyway as there is no need to duplicate the templates when opening a popup but I have preferred going on the safe side before the popup is implemented. May be I can create an issue so that we will remember refactoring this after the popup is implemented ?