update queries to new schema

@message is from the old schema, and gone out of the system. Let's
drop all the old versions of these messages and just go with the
new ones.

Change-Id: I6fb0aa87a291660df879282e9a7851bbb27e9ac2
Merge "update queries to new schema"