Queries from other party now correctly shows only one message
Removed useless commented out menu options item
Merge branch 'feature/fix-query' into develop