switch ExecuteQuery to return List as before
Merge branch 'cg+sql' into encrypt2