Feature/mapping util label fix

Please erase After merge.