updated proposal to reflect changes to query message formatting discussed in issue 1