code cleanup, load more data on interactive layer