Improve UmlgGraph query executions