move selector description to the selector object

Yes, I think it was an existing bug but IMO it can be fixed in this PR as you touched this code anyway.