diff --git a/itemcontroller.lua b/itemcontroller.lua
index cd51118..819df06 100644
--- a/itemcontroller.lua
+++ b/itemcontroller.lua
@@ -260,7 +260,7 @@ end
 
 local PAGES = {
   MAIN = function(state)
-    local pageState = state:currentPageState({})
+    local pageState = state:currentPageState({}, state.changingPage)
 
     if pageState.stacks == nil then
       pageState.stacks = ItemGroup.collectStacks(state.controller:find(function(stack)
@@ -307,7 +307,7 @@ local PAGES = {
     return renderDefault(state, listResult)
   end,
 
-  GROUP_DETAIL = function(state, newPage)
+  GROUP_DETAIL = function(state)
     local paddingSide = 0
     local paddingTop = 0
 
@@ -440,7 +440,7 @@ local PAGES = {
     return renderDefault(state, stuffContainer)
   end,
 
-  REQUEST = function(state, newPage)
+  REQUEST = function(state)
     local group = state:getExtra()
     if group == nil then
       print("No group passed to REQUEST")
@@ -449,11 +449,8 @@ local PAGES = {
     end
 
     local pageState = state:currentPageState(
-      { request = 0, group = group },
-      function(currentPageState)
-        -- True = reset state
-        return currentPageState ~= group
-      end
+      { request = 0 },
+      state.changingPage
     )
 
     local itemName = fitText(group:getSimpleName(), state.width)
@@ -586,7 +583,7 @@ local PAGES = {
             state:itemTransaction(function()
               group:transferTo(state.node)
             end)
-            state:setPage("Main")
+            state:setPage("MAIN")
             return true
           end,
           colors.green,
@@ -683,7 +680,7 @@ function CONTROLLER_STATE:itemTransaction(transact)
 end
 
 function CONTROLLER_STATE:currentPageState(default, override)
-  self.pageState[self.currentPage] = ((not override or (type(override) ~= "function" or not override(self.pageState[self.currentPage]))) and self.pageState[self.currentPage]) or default
+  self.pageState[self.currentPage] = ((not override or ((type(override) == "function") and not override(self.pageState[self.currentPage]))) and self.pageState[self.currentPage]) or default
   return self.pageState[self.currentPage]
 end