Rewrite update handling, and go back to indexing by page id