Entity query

consider major refactor to remove BasicQuery (replace with EntityQuery) and NodeQueryResults to EntityQueryResults.