fix shorttag issue mentioned in #1357

Replaces the short tag with a proper long tag. Review @karlitschek @DeepDiver1975 @simonbuehler

Also indenting.