Move SL swap tag up to parent span element, resolves #460