Ability to select containers also by names

Fixes #2803