Updated to new MSG_QUERY spec