Added 'select' as a trigger word.  +refactor, +tests