DDBNEXT-1625: Fix item field representation
Simplify expressions
Fix import
Merge branch 'DDBNEXT-1625-BOZ' into develop