LPS-32400 - Move all conversions of commands to the *element.ftl instead of the *block_element.ftl