Rapaels magic refactortractor... / Fixed server side saving url and identifier