Merge branch '171-cannot-choose-between-messages-and-chats-in-the-search-field' into 'master'

Resolve "Cannot choose between messages and chats in the search field"

Closes #171

See merge request !214