diff --git a/src/router/context.go b/src/router/context.go
index bef4c41..52ccfcd 100644
--- a/src/router/context.go
+++ b/src/router/context.go
@@ -2,8 +2,10 @@ package router
 
 import (
 	"encoding/json"
+	"fmt"
 	"log"
 	"net/http"
+	"strconv"
 )
 
 type Context struct {
@@ -31,3 +33,15 @@ func (c *Context) JSON(status int, data interface{}) {
 	c.Out.Write(body)
 	c.Out.Write([]byte("\n"))
 }
+
+func (c *Context) VarInt64(key string) (int64, error) {
+	if val, ok := c.Vars[key]; ok {
+		return strconv.ParseInt(val, 10, 64)
+	}
+	return 0, fmt.Errorf("no such var: %s", key)
+}
+
+func (c *Context) QueryInt64(key string) (int64, error) {
+	query := c.Req.URL.Query()
+	return strconv.ParseInt(query.Get("page"), 10, 64)
+}
diff --git a/src/server/handlers.go b/src/server/handlers.go
index 79cff2f..7f798ed 100644
--- a/src/server/handlers.go
+++ b/src/server/handlers.go
@@ -12,7 +12,6 @@ import (
 	"math"
 	"net/http"
 	"reflect"
-	"strconv"
 )
 
 func (s *Server) handler() http.Handler {
@@ -96,7 +95,7 @@ func (s *Server) handleFolderList(c *router.Context) {
 }
 
 func (s *Server) handleFolder(c *router.Context) {
-	id, err := strconv.ParseInt(c.Vars["id"], 10, 64)
+	id, err := c.VarInt64("id")
 	if err != nil {
 		c.Out.WriteHeader(http.StatusBadRequest)
 		return
@@ -136,7 +135,7 @@ func (s *Server) handleFeedErrors(c *router.Context) {
 }
 
 func (s *Server) handleFeedIcon(c *router.Context) {
-	id, err := strconv.ParseInt(c.Vars["id"], 10, 64)
+	id, err := c.VarInt64("id")
 	if err != nil {
 		c.Out.WriteHeader(http.StatusBadRequest)
 		return
@@ -144,7 +143,6 @@ func (s *Server) handleFeedIcon(c *router.Context) {
 	feed := s.db.GetFeed(id)
 	if feed != nil && feed.Icon != nil {
 		c.Out.Header().Set("Content-Type", http.DetectContentType(*feed.Icon))
-		c.Out.Header().Set("Content-Length", strconv.Itoa(len(*feed.Icon)))
 		c.Out.Write(*feed.Icon)
 	} else {
 		c.Out.WriteHeader(http.StatusNotFound)
@@ -198,7 +196,7 @@ func (s *Server) handleFeedList(c *router.Context) {
 }
 
 func (s *Server) handleFeed(c *router.Context) {
-	id, err := strconv.ParseInt(c.Vars["id"], 10, 64)
+	id, err := c.VarInt64("id")
 	if err != nil {
 		c.Out.WriteHeader(http.StatusBadRequest)
 		return
@@ -239,7 +237,7 @@ func (s *Server) handleFeed(c *router.Context) {
 
 func (s *Server) handleItem(c *router.Context) {
 	if c.Req.Method == "PUT" {
-		id, err := strconv.ParseInt(c.Vars["id"], 10, 64)
+		id, err := c.VarInt64("id")
 		if err != nil {
 			c.Out.WriteHeader(http.StatusBadRequest)
 			return
@@ -264,14 +262,14 @@ func (s *Server) handleItemList(c *router.Context) {
 		perPage := 20
 		curPage := 1
 		query := c.Req.URL.Query()
-		if page, err := strconv.ParseInt(query.Get("page"), 10, 64); err == nil {
+		if page, err := c.QueryInt64("page"); err == nil {
 			curPage = int(page)
 		}
 		filter := storage.ItemFilter{}
-		if folderID, err := strconv.ParseInt(query.Get("folder_id"), 10, 64); err == nil {
+		if folderID, err := c.QueryInt64("folder_id"); err == nil {
 			filter.FolderID = &folderID
 		}
-		if feedID, err := strconv.ParseInt(query.Get("feed_id"), 10, 64); err == nil {
+		if feedID, err := c.QueryInt64("feed_id"); err == nil {
 			filter.FeedID = &feedID
 		}
 		if status := query.Get("status"); len(status) != 0 {
@@ -292,12 +290,12 @@ func (s *Server) handleItemList(c *router.Context) {
 			"list": items,
 		})
 	} else if c.Req.Method == "PUT" {
-		query := c.Req.URL.Query()
 		filter := storage.MarkFilter{}
-		if folderID, err := strconv.ParseInt(query.Get("folder_id"), 10, 64); err == nil {
+
+		if folderID, err := c.QueryInt64("folder_id"); err == nil {
 			filter.FolderID = &folderID
 		}
-		if feedID, err := strconv.ParseInt(query.Get("feed_id"), 10, 64); err == nil {
+		if feedID, err := c.QueryInt64("feed_id"); err == nil {
 			filter.FeedID = &feedID
 		}
 		s.db.MarkItemsRead(filter)