Currently, after each expression is parsed the original query statement is not tracked anymore. While this works it creates an issue when displaying an expression that is not named since the reconstructed string can and will vary from the original declaration (upper/lower casing, extra spaces, etc...).
For consistency, just like with location, the initial text should be preserved.