diff --git a/exponent.php b/exponent.php
index ad8b53921a..81367bf7ad 100644
--- a/exponent.php
+++ b/exponent.php
@@ -58,7 +58,7 @@
 
 // Initialize the History (Flow) subsystem.
 $history = new expHistory(); //<--This is the new flow subsystem
-$SYS_FLOW_REDIRECTIONPATH = 'exponent_default';
+//$SYS_FLOW_REDIRECTIONPATH = 'exponent_default';
 
 // Initialize the javascript subsystem
 if (expJavascript::inAjaxAction()) set_error_handler('handleErrors');
diff --git a/framework/core/expFramework.php b/framework/core/expFramework.php
index 5f2f655bc1..012ffe43ed 100755
--- a/framework/core/expFramework.php
+++ b/framework/core/expFramework.php
@@ -46,7 +46,7 @@
  * @name $history
  */
 $history = null;
-$SYS_FLOW_REDIRECTIONPATH = '';
+//$SYS_FLOW_REDIRECTIONPATH = '';
 
 /**
  * the current user object
diff --git a/framework/core/subsystems/expHistory.php b/framework/core/subsystems/expHistory.php
index 4cb14cd2ac..85344dc8a9 100755
--- a/framework/core/subsystems/expHistory.php
+++ b/framework/core/subsystems/expHistory.php
@@ -180,20 +180,20 @@ public function setHistory($url_type, $params) {
 	 *
 	 * @param integer $access_level The access level of the current page.
 	 *  Either SYS_FLOW_PUBLIC or SYS_FLOW_PROTECTED
-	 * @param integer $url_type The type of URSL being set.  Either
+	 * @param integer $url_type The type of URL being set.  Either
 	 *  SYS_FLOW_SECTIONAL or SYS_FLOW_ACTION
 	 * @node Subsystems:Flow
 	 */
 	public static function flowSet($access_level,$url_type) {
-		global $SYS_FLOW_REDIRECTIONPATH;
+//		global $SYS_FLOW_REDIRECTIONPATH;
 		global $router;
 		//echo '<h1>setting flow</h1>'.$router->current_url;
-		if ($access_level == SYS_FLOW_PUBLIC) {
-			expSession::set($SYS_FLOW_REDIRECTIONPATH.'_flow_' . SYS_FLOW_PROTECTED . '_' . $url_type, $router->current_url);
-			expSession::set($SYS_FLOW_REDIRECTIONPATH.'_flow_last_' . SYS_FLOW_PROTECTED, $router->current_url);
-		}
-		expSession::set($SYS_FLOW_REDIRECTIONPATH.'_flow_' . $access_level . '_' . $url_type, $router->current_url);
-		expSession::set($SYS_FLOW_REDIRECTIONPATH.'_flow_last_' . $access_level, $router->current_url);
+//		if ($access_level == SYS_FLOW_PUBLIC) {
+//			expSession::set($SYS_FLOW_REDIRECTIONPATH.'_flow_' . SYS_FLOW_PROTECTED . '_' . $url_type, $router->current_url);
+//			expSession::set($SYS_FLOW_REDIRECTIONPATH.'_flow_last_' . SYS_FLOW_PROTECTED, $router->current_url);
+//		}
+//		expSession::set($SYS_FLOW_REDIRECTIONPATH.'_flow_' . $access_level . '_' . $url_type, $router->current_url);
+//		expSession::set($SYS_FLOW_REDIRECTIONPATH.'_flow_last_' . $access_level, $router->current_url);
 
 		//FIXME:  Glue code to try to get new history and old flow to play nicely together.
 		expHistory::set('viewable', $router->params);
diff --git a/framework/core/subsystems/expTheme.php b/framework/core/subsystems/expTheme.php
index 9e1d6df5a4..410b3f0877 100755
--- a/framework/core/subsystems/expTheme.php
+++ b/framework/core/subsystems/expTheme.php
@@ -916,15 +916,23 @@ public static function goDefaultSection() {
 	 * @node Subsystems:Theme
 	 */
 	public static function mainContainer() {
+		global $router;
+
 		if (!AUTHORIZED_SECTION) {
 			// Set this so that a login on an Auth Denied page takes them back to the previously Auth-Denied page
-			expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_SECTIONAL);
+//			expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_SECTIONAL);
+			expHistory::set('manageable', $router->params);
 			echo SITE_403_HTML;
 			return;
 		}
 
-		if (PUBLIC_SECTION) expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_SECTIONAL);
-		else expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_SECTIONAL);
+		if (PUBLIC_SECTION) {
+//			expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_SECTIONAL);
+			expHistory::set('viewable', $router->params);
+		} else {
+//			expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_SECTIONAL);
+			expHistory::set('manageable', $router->params);
+		}
 
 	#   if (expSession::is_set("themeopt_override")) {
 	#       $config = expSession::get("themeopt_override");
diff --git a/framework/modules-1/bots/actions/manage_bots.php b/framework/modules-1/bots/actions/manage_bots.php
index ba03c46687..f25cbcfe8e 100644
--- a/framework/modules-1/bots/actions/manage_bots.php
+++ b/framework/modules-1/bots/actions/manage_bots.php
@@ -20,10 +20,12 @@
 // Part of the Extensions category
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
 if (expPermissions::check('extensions',expCore::makeLocation('administrationmodule'))) {
-	expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_ACTION);
-	
+//	expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_ACTION);
+	expHistory::set('manageable', $router->params);
+
 	// get new bots into the database
 	if (is_readable(BASE.'framework/modules-1/bots/bots')) {
         $dh = opendir(BASE.'framework/modules-1/bots/bots');
diff --git a/framework/modules-1/calendarmodule/actions/ical.php b/framework/modules-1/calendarmodule/actions/ical.php
index 447a6f97f5..35ffec1ed4 100644
--- a/framework/modules-1/calendarmodule/actions/ical.php
+++ b/framework/modules-1/calendarmodule/actions/ical.php
@@ -20,7 +20,7 @@
 
 if (!defined('EXPONENT')) exit('');
 
-//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);  //FIXME we don't need to return here, do we?
 // id & date_id set if single event, else
 //   src & time (opt?) set for longer list/month, etc...
 if (isset($_GET['date_id']) || isset($_GET['src'])) {
diff --git a/framework/modules-1/calendarmodule/actions/search.php b/framework/modules-1/calendarmodule/actions/search.php
index e8b4fbc11c..b58cb38792 100644
--- a/framework/modules-1/calendarmodule/actions/search.php
+++ b/framework/modules-1/calendarmodule/actions/search.php
@@ -33,8 +33,10 @@
 /** @define "BASE" "../../../.." */
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
-expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+expHistory::set('viewable', $router->params);
 
 $template = new template("calendarmodule","_search",$loc,false);
 $time = (isset($_GET['time']) ? $_GET['time'] : time());
diff --git a/framework/modules-1/calendarmodule/actions/view.php b/framework/modules-1/calendarmodule/actions/view.php
index 2f992da170..e0d0fe18a7 100644
--- a/framework/modules-1/calendarmodule/actions/view.php
+++ b/framework/modules-1/calendarmodule/actions/view.php
@@ -18,8 +18,10 @@
 ##################################################
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
-expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+expHistory::set('viewable', $router->params);
 
 $item = $db->selectObject("calendar","id=" . intval($_GET['id']));
 if ($item) {
diff --git a/framework/modules-1/calendarmodule/actions/viewday.php b/framework/modules-1/calendarmodule/actions/viewday.php
index 7dac69302c..a4ecd3a5f1 100644
--- a/framework/modules-1/calendarmodule/actions/viewday.php
+++ b/framework/modules-1/calendarmodule/actions/viewday.php
@@ -18,8 +18,10 @@
 ##################################################
  
 if (!defined('EXPONENT')) exit('');
+global $router;
 
-expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+expHistory::set('viewable', $router->params);
 
 $time = (isset($_GET['time']) ? $_GET['time'] : time());
 $info = getdate(intval($time));
diff --git a/framework/modules-1/calendarmodule/actions/viewmonth.php b/framework/modules-1/calendarmodule/actions/viewmonth.php
index 7b6bccec2e..47c63c004f 100644
--- a/framework/modules-1/calendarmodule/actions/viewmonth.php
+++ b/framework/modules-1/calendarmodule/actions/viewmonth.php
@@ -18,8 +18,10 @@
 ##################################################
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
-expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+expHistory::set('viewable', $router->params);
 
 $view = (isset($_GET['view']) ? $_GET['view'] : "Default");
 $title = $db->selectValue('container', 'title', "internal='".serialize($loc)."'");
diff --git a/framework/modules-1/calendarmodule/actions/viewtag.php b/framework/modules-1/calendarmodule/actions/viewtag.php
index f368061d56..c424104a68 100644
--- a/framework/modules-1/calendarmodule/actions/viewtag.php
+++ b/framework/modules-1/calendarmodule/actions/viewtag.php
@@ -19,8 +19,10 @@
 /** @define "BASE" "../../../.." */
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
-expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+expHistory::set('viewable', $router->params);
 
 $locsql = "(location_data='".serialize($loc)."'";
 // look for possible aggregate
diff --git a/framework/modules-1/calendarmodule/actions/viewweek.php b/framework/modules-1/calendarmodule/actions/viewweek.php
index a32b050d2d..7ed63f91ad 100644
--- a/framework/modules-1/calendarmodule/actions/viewweek.php
+++ b/framework/modules-1/calendarmodule/actions/viewweek.php
@@ -19,8 +19,10 @@
 /** @define "BASE" "../../../.." */
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
-expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+expHistory::set('viewable', $router->params);
 
 $title = $db->selectValue('container', 'title', "internal='".serialize($loc)."'");
 
diff --git a/framework/modules-1/formbuilder/actions/edit_record.php b/framework/modules-1/formbuilder/actions/edit_record.php
index 5fd8b180ba..9216274375 100644
--- a/framework/modules-1/formbuilder/actions/edit_record.php
+++ b/framework/modules-1/formbuilder/actions/edit_record.php
@@ -64,7 +64,7 @@
 		
 //		$form->register(uniqid(''),'', new htmlcontrol('<br /><br />'));
 		$form->register(uniqid(''),'', new htmlcontrol($antispam));
-		$form->register('submit','',new buttongroupcontrol(gt('Save'),'',gt('Cancel'),"","",1));
+		$form->register('submit','',new buttongroupcontrol(gt('Save'),'',gt('Cancel'),"","",'editable'));
 		$form->meta('action','submit_form');
 		$form->meta('m',$loc->mod);
 		$form->meta('s',$loc->src);
@@ -74,8 +74,8 @@
 		$form->meta('data_id',$data->id);
 		$form->location($loc);
 		
-		global $SYS_FLOW_REDIRECTIONPATH;
-		$SYS_FLOW_REDIRECTIONPATH = "editfallback";
+//		global $SYS_FLOW_REDIRECTIONPATH;
+//		$SYS_FLOW_REDIRECTIONPATH = "editfallback";
 		$template = new template('formbuilder','_view_form');
 		$template->assign('form_html',$form->toHTML($f->id));
 		$template->assign('form',$f);
diff --git a/framework/modules-1/formbuilder/actions/export_csv.php b/framework/modules-1/formbuilder/actions/export_csv.php
index faa988d02f..63a44e3b1d 100644
--- a/framework/modules-1/formbuilder/actions/export_csv.php
+++ b/framework/modules-1/formbuilder/actions/export_csv.php
@@ -21,7 +21,7 @@
 if (!defined('EXPONENT')) exit('');
 
 $template = new template('formbuilder','_data_view');
-expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);  //FIXME we shouldn't need to return here, right?
 
 if (isset($_GET['id'])) {
 	$_GET['id'] = intval($_GET['id']);
@@ -141,7 +141,7 @@
 			//Read the file out directly
 
 			readfile($tmpfname);
-			exit();
+			if (DEVELOPMENT == 0) exit();
 
 			unlink($tmpfname);
 
diff --git a/framework/modules-1/formbuilder/actions/view_data.php b/framework/modules-1/formbuilder/actions/view_data.php
index cd642f34d6..eed643da67 100644
--- a/framework/modules-1/formbuilder/actions/view_data.php
+++ b/framework/modules-1/formbuilder/actions/view_data.php
@@ -100,11 +100,11 @@
 		
 //		$template->assign("items",$items);
 		$template->assign("f",$f);
-		global $SYS_FLOW_REDIRECTIONPATH;
-		$SYS_FLOW_REDIRECTIONPATH = "editfallback";
+//		global $SYS_FLOW_REDIRECTIONPATH;
+//		$SYS_FLOW_REDIRECTIONPATH = "editfallback";
 		$template->assign("backlink",expHistory::getLastNotEditable());
 		$template->register_permissions(array("administrate","editform","editformsettings","editreport","viewdata","editdata","deletedata"),unserialize($f->location_data));
-		$SYS_FLOW_REDIRECTIONPATH = "exponent_default";
+//		$SYS_FLOW_REDIRECTIONPATH = "exponent_default";
 		$columndef .= 'new cColumn("Links","",links,null)';
 		$columndef .= ');';
 		
diff --git a/framework/modules-1/formbuilder/actions/view_form.php b/framework/modules-1/formbuilder/actions/view_form.php
index a825174aee..960a738cc3 100644
--- a/framework/modules-1/formbuilder/actions/view_form.php
+++ b/framework/modules-1/formbuilder/actions/view_form.php
@@ -44,10 +44,10 @@
 		$template = new template("formbuilder","_view_form");
 		$template->assign("form_html",$form->toHTML($f->id));
 		$template->assign("form",$f);
-		global $SYS_FLOW_REDIRECTIONPATH;
-		$SYS_FLOW_REDIRECTIONPATH = "editfallback";
+//		global $SYS_FLOW_REDIRECTIONPATH;
+//		$SYS_FLOW_REDIRECTIONPATH = "editfallback";
 		$template->assign("backlink",expHistory::getLastNotEditable());
-		$SYS_FLOW_REDIRECTIONPATH = "exponent_default";
+//		$SYS_FLOW_REDIRECTIONPATH = "exponent_default";
 		
 		$types = expTemplate::listControlTypes();
 		$types[".break"] = gt('Spacer');
diff --git a/framework/modules-1/formmodule/class.php b/framework/modules-1/formmodule/class.php
index f3ac5f4d5b..598af4ca69 100644
--- a/framework/modules-1/formmodule/class.php
+++ b/framework/modules-1/formmodule/class.php
@@ -87,11 +87,11 @@ function show($view,$loc = null) {
 				$db->insertObject($rpt,"formbuilder_report");
 				$f->id = $frmid;
 			}
-			global $SYS_FLOW_REDIRECTIONPATH;
-			//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
-			$SYS_FLOW_REDIRECTIONPATH = "editfallback";
-			//expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
-			$SYS_FLOW_REDIRECTIONPATH = "exponent_default";
+//			global $SYS_FLOW_REDIRECTIONPATH;
+//			expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//			$SYS_FLOW_REDIRECTIONPATH = "editfallback";
+//			expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//			$SYS_FLOW_REDIRECTIONPATH = "exponent_default";
 			
 			$floc = unserialize($f->location_data);
 			$controls = $db->selectObjects("formbuilder_control","form_id=".$f->id);
diff --git a/framework/modules-1/navigationmodule/actions/manage.php b/framework/modules-1/navigationmodule/actions/manage.php
index 9db68796c2..dc84381286 100644
--- a/framework/modules-1/navigationmodule/actions/manage.php
+++ b/framework/modules-1/navigationmodule/actions/manage.php
@@ -18,11 +18,13 @@
 ##################################################
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
 if (expPermissions::check('manage','navigationmodule')) {
     global $user;
-	expHistory::flowSet(SYS_FLOW_PROTECTED, SYS_FLOW_ACTION);
-	
+//	expHistory::flowSet(SYS_FLOW_PROTECTED, SYS_FLOW_ACTION);
+	expHistory::set('manageable', $router->params);
+
 	$template = new template('navigationmodule','_manager',$loc);
 	
 	$template->assign('sections',navigationmodule::levelTemplate(0,0));
diff --git a/framework/modules-1/navigationmodule/actions/manage_pagesets.php b/framework/modules-1/navigationmodule/actions/manage_pagesets.php
index 2c57b70b74..eb28cb52b4 100644
--- a/framework/modules-1/navigationmodule/actions/manage_pagesets.php
+++ b/framework/modules-1/navigationmodule/actions/manage_pagesets.php
@@ -18,10 +18,12 @@
 ##################################################
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
 if ($user && $user->is_acting_admin == 1) {
-	expHistory::flowSet(SYS_FLOW_PROTECTED, SYS_FLOW_ACTION);
-	
+//	expHistory::flowSet(SYS_FLOW_PROTECTED, SYS_FLOW_ACTION);
+	expHistory::set('manageable', $router->params);
+
 	$template = new template('navigationmodule','_manager_pagesets',$loc);
 	
 	$tpls = $db->selectObjects('section_template','parent=0');
diff --git a/framework/modules-1/navigationmodule/actions/manage_standalone.php b/framework/modules-1/navigationmodule/actions/manage_standalone.php
index 996cfb3121..8918759eec 100644
--- a/framework/modules-1/navigationmodule/actions/manage_standalone.php
+++ b/framework/modules-1/navigationmodule/actions/manage_standalone.php
@@ -18,10 +18,12 @@
 ##################################################
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
 if ($user && $user->is_acting_admin == 1) {
-	expHistory::flowSet(SYS_FLOW_PROTECTED, SYS_FLOW_ACTION);
-	
+//	expHistory::flowSet(SYS_FLOW_PROTECTED, SYS_FLOW_ACTION);
+	expHistory::set('manageable', $router->params);
+
 	$template = new template('navigationmodule','_manager_standalone',$loc);
 	
 	$sections = $db->selectObjects('section','parent=-1');
diff --git a/framework/modules-1/navigationmodule/actions/view_template.php b/framework/modules-1/navigationmodule/actions/view_template.php
index 292c2e3b82..dabb25e67a 100644
--- a/framework/modules-1/navigationmodule/actions/view_template.php
+++ b/framework/modules-1/navigationmodule/actions/view_template.php
@@ -18,6 +18,7 @@
 ##################################################
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
 if ($user && $user->is_acting_admin == 1) {
 	$page = null;
@@ -26,8 +27,9 @@
 	}
 	
 	if ($page) {
-		expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_ACTION);
-	
+//		expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_ACTION);
+		expHistory::set('manageable', $router->params);
+
 		$template = new template('navigationmodule','_view_template',$loc);
 		$template->assign('template',$page);
 		$template->assign('subs',navigationmodule::getTemplateHierarchyFlat($page->id));
diff --git a/framework/modules-1/simplepollmodule/actions/manage_question.php b/framework/modules-1/simplepollmodule/actions/manage_question.php
index 1bd7e99d30..90bbe8f1b1 100644
--- a/framework/modules-1/simplepollmodule/actions/manage_question.php
+++ b/framework/modules-1/simplepollmodule/actions/manage_question.php
@@ -33,6 +33,7 @@
 /** @define "BASE" "../../.." */
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
 $question = null;
 if (isset($_GET['id'])) {
@@ -44,8 +45,9 @@
 
 if ($question) {
 	if (expPermissions::check('manage_question',$loc) || expPermissions::check('manage_answer',$loc)) {
-		expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_ACTION);
-	
+//		expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_ACTION);
+		expHistory::set('manageable', $router->params);
+
 		$answers = $db->selectObjects('poll_answer','question_id='.$question->id);
 		$answers = expSorter::sort(array('array'=>$answers,'sortby'=>'rank', 'order'=>'ASC', 'type'=>'a'));
 
diff --git a/framework/modules-1/simplepollmodule/actions/manage_questions.php b/framework/modules-1/simplepollmodule/actions/manage_questions.php
index a41131749b..c2bede86e1 100644
--- a/framework/modules-1/simplepollmodule/actions/manage_questions.php
+++ b/framework/modules-1/simplepollmodule/actions/manage_questions.php
@@ -32,10 +32,12 @@
 ##################################################
 
 if (!defined('EXPONENT')) exit('');
+global $router;
 
 if (expPermissions::check('manage_question',$loc) || expPermissions::check('manage_answer',$loc)) {
-	expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_ACTION);
-	
+//	expHistory::flowSet(SYS_FLOW_PROTECTED,SYS_FLOW_ACTION);
+	expHistory::set('manageable', $router->params);
+
 	$questions = $db->selectObjects('poll_question',"location_data='".serialize($loc)."'");
 	for ($i = 0; $i < count($questions); $i++) {
 		$questions[$i]->answer_count = $db->countObjects('poll_answer','question_id='.$questions[$i]->id);
diff --git a/framework/modules/users/controllers/loginController.php b/framework/modules/users/controllers/loginController.php
index 19c3bb6499..f7310c8dce 100644
--- a/framework/modules/users/controllers/loginController.php
+++ b/framework/modules/users/controllers/loginController.php
@@ -133,6 +133,7 @@ public static function login() {
 	 */
 	public static function loginredirect() {
 		global $user;
+		global $router;
 
 		ob_start();
 		if ($user->isLoggedIn()) {
@@ -141,7 +142,8 @@ public static function loginredirect() {
 			//expSession::set('redirecturl', expHistory::getLastNotEditable());
 			expSession::set('redirecturl', expHistory::getLast());
 			expSession::set('redirecturl_error', makeLink(array('controller'=>'login', 'action'=>'loginredirect')));
-			expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+//			expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_ACTION);
+			expHistory::set('viewable', $router->params);
 		}
 		redirect_to(array('controller'=>'login', 'action'=>'showlogin'));
 	}
diff --git a/popup.php b/popup.php
index 941f3442f7..d8d90bd387 100644
--- a/popup.php
+++ b/popup.php
@@ -32,12 +32,13 @@
 	(isset($_GET['int'])?$_GET['int']:'')
 );
 
-$SYS_FLOW_REDIRECTIONPATH='popup';
+//$SYS_FLOW_REDIRECTIONPATH='popup';
 
 if (expTheme::inAction()) {
 	expTheme::runAction();
 } else if (isset($_GET['module']) && isset($_GET['view'])) {
-	expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_SECTIONAL);
+//	expHistory::flowSet(SYS_FLOW_PUBLIC,SYS_FLOW_SECTIONAL);
+	expHistory::set('viewable', $router->params);
 
 	$mod = new $_GET['module']();
 	$mod->show($_GET['view'],$loc,(isset($_GET['title'])?$_GET['title']:''));
diff --git a/selector.php b/selector.php
index 966e2d36aa..c2ad3cc4e8 100644
--- a/selector.php
+++ b/selector.php
@@ -41,7 +41,7 @@ function epb($buffer, $mode) {
 if (is_readable(BASE.$page)) {
 	define('PREVIEW_READONLY',1); // for mods
 	define('SELECTOR',1);
-	$SYS_FLOW_REDIRECTIONPATH='source_selector';
+//	$SYS_FLOW_REDIRECTIONPATH='source_selector';
 
 	$source_select = array();
 	if (expSession::is_set('source_select')) $source_select = expSession::get('source_select');