rename query name variable name to __query_name__
fix version
fix regression