Adding query by property and query by data identifier. To do - generalize set of query calls.