HEMERA-3482, HEMERA-3001: Fix move label for itemaware elements