Add needed markup to ID template as well