Add indexes and fix object saving (save only on updated URLs)