Fix search
Add short to channel view