re-ordering; logic fix in validateAnnounceQuery