Hotfixes

Adding a bug fix for the channelfinder auto-complete