refactor selected to a "current object" + related test
tests related to "current" object in collection service
refactor selected to a "current object"