Issue #505 fixing spacing tags