[NLM-521] fixed fig and table-wrap (with or without label) transformations