Made session a singleton
Fixed error
Merge remote-tracking branch 'origin/feature/search-users-and-channels' into feature/search-users-and-channels