Fixed queries. For second round viewing. No formatting/parsing yet.