XWIKI Office Importer fails to order annotations to images correctly

Do you know how it is possible to get along with arrows and annotations such as text fields inside images?
The problem is that XWIKI Office Importer puts such things under the pictures after the Office Importer process.
I have many documents with arrows and text fields around the pictures and I cannot handle that issue effectively without losing layout.