Add single quoted strings.
Integrate query parsing with server.