Updates to the viewing and search modules