VID-1825 Remove whitespace between tags

Note: this same change is in VID-1821 (which hasn't been merged yet) which means there might be small conflict when merging this one. I didn't want to branch off VID-1821 in case there were any more changes to be made on that one.