Changed search to work in PM instead of in main chat
Merging PR from SJShaw
Merged from upstream