Use full url as key_name
Merge branch 'fix-8-urls-with-queries'

* fix-8-urls-with-queries:
  Use full url as key_name