Issue #2942482 AND Issue #2976467 by shivamitakari, MartinTomes, koosvdkolk, adriancotter, alrh, hcethatsme: Issue 2934596 breaks recognition of media tags