Thanks Tobias for the answer – I guess there will be no easy fix for this in the Extension.
and
Thanks tmbg for the suggested solution. I will look into this but I suspect there will probably be some difficulties since I use the shortcodes in url-parameters.
Anyway, I should edit my tables in Excel since they have become quite complex.
Regards,
Dan