Grey goo fix

* Fix for #3420
* Adding span class stuff