We should simplify Generic that breaks at times, by simply reissuing the query for the new data.
Generic