* Fixes NB#97657, replace "TODO" strings by the proper logical ids