PRD-4577 Fix selection of items