Improve markup gems
Merge pull request #7387 from Razer6/add_markup_gems

Improve markup gems to prevent 500 errors