Use right matcher for matching shell title. Fixes #713