AI-581 - corrected enum types handling for expression builders