added two versions of initial data, with and without jobs as labels on people
updated all queries to be friendly 2.0 versions