> Thanks!
> Instead of manually constructing the regexp, you can use
> `org-complex-heading-regexp-format'.

Thanks for the tip. Applied changes in the new patch.