Refactoring SelectItemListener
Small fixes