If you still get the invalid query message, I will have to create a new test in the morning and attempt to duplicate the issue.
Once you have a successful install, patch your installation with the updated ZIP that includes some of the changes from this thread, and run the install script again as if you were upgrading. This should rebuild your phrases and templates and other things.