added url and analytics params
fixed buch of stuff
Revert "fixed buch of stuff"

This reverts commit 9b803db541668062ebed9b5f9b22b2cf89ccdc3e.
Revert "Revert "fixed buch of stuff""

This reverts commit 41fb89f16d2af8326afcb86b7c4d36a6651354a9.