Hi @danboggins,
I noticed this kind of issue some months ago, and raised it in https://github.com/plone/plone.app.layout/issues/91
To do it properly fixes are needed across a few products, such as plone.app.multilingual and plone.app.layout. That started, but my project got pulled before it completed, so it's looking for someone to take it over 