Using scope.query instead of 'http'
Rebase fixing..