Correlated Name parameters for Query 1
fix unicode problems