Add entry filtering; add more data;