diff --git a/spring-webflow-reference/src/actions.xml b/spring-webflow-reference/src/actions.xml
index 046de63e..4a9fa26f 100644
--- a/spring-webflow-reference/src/actions.xml
+++ b/spring-webflow-reference/src/actions.xml
@@ -39,7 +39,7 @@
     	<on-entry>
             <evaluate expression="interview.getNextQuestionSet()" result="viewScope.questionSet" />
     	</on-entry>
-        <transition on="submitAnswers">
+        <transition on="submitAnswers" to="moreAnswersNeeded">
             <evaluate expression="interview.recordAnswers(questionSet)" />
         </transition>
     </view-state>
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml
index a6037f29..f7806ebc 100755
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml
@@ -9,16 +9,21 @@
 		<on-render>
 			<evaluate expression="bookingService.findBookings(currentUser.name)" result="viewScope.bookings" result-type="dataModel" />
 		</on-render>
-		<transition on="search" to="reviewHotels">
-            <evaluate expression="searchCriteria.resetPage()" />
-        </transition>
+		<transition on="search" />
 		<transition on="cancelBooking">
 			<evaluate expression="bookingService.cancelBooking(bookings.selectedRow)" />
 			<render fragments="bookingsFragment" />
 		</transition>
 	</view-state>
-	 
-	<view-state id="reviewHotels">
+	
+	<action-state id="resetPage">
+        <evaluate expression="searchCriteria.resetPage()" />
+        <transition on="success" to="enterSearchCriteria">
+        	<render fragments="form"/>
+        </transition>
+	</action-state>
+	
+	<view-state id="reviewHotels" redirect="false">
 		<on-render>
 			<evaluate expression="bookingService.findHotels(searchCriteria)" result="viewScope.hotels" result-type="dataModel" />
 		</on-render>
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/RequestControlContext.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/RequestControlContext.java
index dd17b8a9..24712df7 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/RequestControlContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/RequestControlContext.java
@@ -139,9 +139,9 @@ public interface RequestControlContext extends RequestContext {
 	public void endActiveFlowSession(String outcome, MutableAttributeMap output) throws IllegalStateException;
 
 	/**
-	 * Returns true if the 'always redirect pause' flow execution attribute is set to true, false otherwise.
+	 * Returns true if the 'redirect on pause' flow execution attribute is set to true, false otherwise.
 	 * @return true or false
 	 */
-	public boolean getAlwaysRedirectOnPause();
+	public boolean getRedirectOnPause();
 
 }
\ No newline at end of file
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java
index f4f514aa..ec25c367 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/ViewState.java
@@ -167,16 +167,28 @@ public class ViewState extends TransitionableState {
 	}
 
 	protected void doEnter(RequestControlContext context) throws FlowExecutionException {
-		context.assignFlowExecutionKey();
-		if (context.getExternalContext().isResponseAllowed()) {
-			if (shouldRedirect(context)) {
-				context.getExternalContext().requestFlowExecutionRedirect();
-				if (popup) {
-					context.getExternalContext().requestRedirectInPopup();
+		ViewState originatingViewState = (ViewState) context.getRequestScope().get("webflow.originatingViewState");
+		if (this == originatingViewState) {
+			if (context.getExternalContext().isResponseAllowed()) {
+				if (context.getExternalContext().isAjaxRequest()) {
+					View view = viewFactory.getView(context);
+					render(context, view);
+				} else {
+					context.getExternalContext().requestFlowExecutionRedirect();
+				}
+			}
+		} else {
+			context.assignFlowExecutionKey();
+			if (context.getExternalContext().isResponseAllowed()) {
+				if (shouldRedirect(context)) {
+					context.getExternalContext().requestFlowExecutionRedirect();
+					if (popup) {
+						context.getExternalContext().requestRedirectInPopup();
+					}
+				} else {
+					View view = viewFactory.getView(context);
+					render(context, view);
 				}
-			} else {
-				View view = viewFactory.getView(context);
-				render(context, view);
 			}
 		}
 	}
@@ -190,9 +202,14 @@ public class ViewState extends TransitionableState {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Event '" + event.getId() + "' returned from view " + view);
 			}
+			context.getRequestScope().put("webflow.originatingViewState", this);
 			boolean stateExited = context.handleEvent(event);
 			if (!stateExited && context.getExternalContext().isResponseAllowed()) {
-				render(context, view);
+				if (context.getExternalContext().isAjaxRequest()) {
+					render(context, view);
+				} else {
+					context.getExternalContext().requestFlowExecutionRedirect();
+				}
 			}
 		} else {
 			if (context.getExternalContext().isResponseAllowed()) {
@@ -224,7 +241,7 @@ public class ViewState extends TransitionableState {
 		if (redirect != null) {
 			return redirect.booleanValue();
 		} else {
-			return context.getAlwaysRedirectOnPause();
+			return context.getRedirectOnPause();
 		}
 	}
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/RequestControlContextImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/RequestControlContextImpl.java
index 6d5605d9..a29726cf 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/RequestControlContextImpl.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/impl/RequestControlContextImpl.java
@@ -225,7 +225,7 @@ class RequestControlContextImpl implements RequestControlContext {
 		flowExecution.endActiveFlowSession(outcome, output, this);
 	}
 
-	public boolean getAlwaysRedirectOnPause() {
+	public boolean getRedirectOnPause() {
 		Boolean redirectOnPause = flowExecution.getAttributes().getBoolean("alwaysRedirectOnPause");
 		return redirectOnPause != null ? redirectOnPause.booleanValue() : false;
 	}
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd
index a0358b68..3de66edf 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/spring-webflow-2.0.xsd
@@ -500,7 +500,7 @@ The default convention is to treat the id of this view state as the view identif
 								<xsd:annotation>
 									<xsd:documentation>
 										<![CDATA[
-Requests this view-state send a flow execution redirect before rendering.  Default is false.				
+Requests this view-state send a flow execution redirect before rendering.  Default is false.			
 ]]>
 									</xsd:documentation>
 								</xsd:annotation>
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestControlContext.java b/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestControlContext.java
index 02bf84b9..cb1c49e0 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestControlContext.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/test/MockRequestControlContext.java
@@ -121,7 +121,7 @@ public class MockRequestControlContext extends MockRequestContext implements Req
 		}
 	}
 
-	public boolean getAlwaysRedirectOnPause() {
+	public boolean getRedirectOnPause() {
 		return alwaysRedirectOnPause;
 	}
 
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
index fbd935c6..5f150dd3 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
@@ -82,7 +82,6 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 		context.putRequestParameter("id", "1");
 		resumeFlow(context);
 		assertCurrentStateEquals("displayResults");
-		assertResponseWrittenEquals("searchResults", context);
 	}
 
 	protected void configureFlowBuilderContext(MockFlowBuilderContext builderContext) {