--- a/qrurls/views.py	Mon Sep 02 03:53:49 2013 +0300
+++ b/qrurls/views.py	Mon Sep 02 04:02:17 2013 +0300
@@ -51,18 +51,19 @@
         urls    = urls,
     ))
 
-def shorturl (request, **opts) :
+def shorturl (request, shorturl=None, shorturl_id=None) :
     """
         Primary frontend for redirecting based on current time.
     """
     
-    key = 'qrurls/urlfeed/{shorturl}/url'.format(shorturl=opts) # format as dict
+    key = 'qrurls/urlfeed/{shorturl}'.format(shorturl=(shorturl or shorturl_id)) # format as dict
     data = cache.get(key)
     
     if data :
         url, modified = data
     else:
-        url_item = _get_url_item(**opts)
+        url_item = _get_url_item(shorturl=shorturl, shorturl_id=shorturl_id)
+
         modified = url_item.last_modified()
         url = url_item.get_absolute_url()
 
@@ -70,18 +71,19 @@
 
     # redirect, either directly, or to image()
     response = HttpResponseRedirect(url)
-
-    # set cache
     response['Vary'] = ''
     response['Last-Modified'] = http_datetime(modified)
     return response
     
-def item (request, **opts) :
+def item (request, shorturl, item_id) :
     """
         Frontend for a specific item.
     """
-
-    url_item = _get_url_item(related=('shorturl', 'image',), **opts)
+    
+    url_item = _get_url_item(
+            shorturl=shorturl, item_id=item_id,
+            related=('shorturl', 'image')
+    )
 
     if url_item.url :
         response = HttpResponseRedirect(url_item.url)