I feel like the only propper fix can come from the devs themselves, support for codeblock related things is pretty bad atm.