Fix failing test (the text edit order has changed)
Merge branch 'dangoor/two-tags' into ResearchLiveHTML

(Forgot to push the test fix)