introduced AbstractQueryData, renamed test
better generalization of AbstractQueryData
some clean up
DeleteQuery also uses QueryData now