LQE-208 - Fix choose from list due to new structure