             fragment = '#!service-details'
     else if resource == 'unit' and specs.unit != null
         path.push specs.unit
-    protocol + path.join('/') + generateQuery(specs, resource) + fragment
+    protocol + path.join('/') + generateQuery(specs, resource, originalUrl) + fragment
 
 redirector = (req, res) ->
     specs = extractSpecification(req)
-    url = generateUrl(specs)
+    url = generateUrl(specs, req.originalUrl)
     res.redirect 301, url
     return
 

    if resource = 'address'
        addQuery 'radius', specs.radius

    if queryParts.length == 0
        return ''
    '?' + queryParts.join('&')

        return 'address'
    null

generateUrl = (specs, originalUrl) ->
    protocol = 'http://'
    subDomain = languageIdMap[specs.language.id]
    resource = getResource(specs)
