Add message buffer and unlimited search results