[Fix] fix fields and add id #PS-473

Denis Brekhunov requested to merge PS-473/denis-fix into master
Edited by Bogdan Slusarenko

Merge request reports