#2 Improve url encrypting