Add json property to AbstractDataQuery with corresponding test