I wonder if we shouldn't base this on real markup generated by the app, @Raven24 ?