(#2477) - WIP - fix reserved words in doc ids