I have moved this into the Jira project covering the major overhaul in query parsing to verify that this is no longer a problem in that code.