Refactor conversations query/Ergonomic change