Refactor query string construction
Graph drawing