NXP-15145: more fixes around selected items retrieval