[DF-4694] Fix selection