Change the way data are identified. Correct refresh bugs.