diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml
index d1380f38..27638c10 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/enterSearchCriteria.xhtml
@@ -11,7 +11,7 @@
 	<ui:fragment id="hotelSearchFragment">
 		<div id="hotelSearch" class="section">
 		    <span class="errors">
-		       <h:messages globalOnly="true"/>
+		       <h:messages globalOnly="true" />
 		    </span>
 			<h2>Search Hotels</h2>
 			<h:form id="mainForm">
@@ -19,17 +19,17 @@
 					<div class="searchGroup">
 						<div class="searchField">
 						<sf:clientTextValidator promptMessage="Search hotels by name, address, city, or zip.">
-							<h:inputText id="searchString" value="#{flowScope.searchCriteria.searchString}" style="width: 165px; height: 15px;"/>
+							<h:inputText id="searchString" value="#{searchCriteria.searchString}" style="width: 165px; height: 15px;" />
 						</sf:clientTextValidator>
 						</div>
 						<div class="searchSize">
 						   	<h:outputLabel for="pageSize">Maximum results:</h:outputLabel>
-							<h:selectOneMenu id="pageSize" value="#{flowScope.searchCriteria.pageSize}">
-								<f:selectItems value="#{referenceData.pageSizeOptions}"/>
+							<h:selectOneMenu id="pageSize" value="#{searchCriteria.pageSize}">
+								<f:selectItems value="#{referenceData.pageSizeOptions}" />
 							</h:selectOneMenu>
 				   		</div>
 						<div class="searchButton">
-							<sf:commandButton id="findHotels" value="Find Hotels" processIds="hotelSearchFragment" action="search"/>
+							<sf:commandButton id="findHotels" value="Find Hotels" processIds="hotelSearchFragment" action="search" />
 						</div>
 					</div>
 			    </fieldset>
@@ -73,7 +73,7 @@
 					</h:column>
 					<h:column>
 						<f:facet name="header">Action</f:facet>
-						<sf:commandLink id="cancel" value="Cancel" processIds="bookingsFragment" action="cancelBooking"/>
+						<sf:commandLink id="cancel" value="Cancel" processIds="bookingsFragment" action="cancelBooking" />
 					</h:column>
 				</h:dataTable>
 			</h:form>
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml
index 725dea2a..81712b45 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/reviewHotel.xhtml
@@ -47,7 +47,7 @@
 <div class="section">
 	<!-- Use of a plain form element instead of the h:form component is a temporary workaround as spring-security 2.0-M2 is not forwarding to the correct URL when using a post -->
 	<form id="hotel" method="get">
-	<input name="execution" type="hidden" value="${requestContext.flowExecutionContext.key}"/>
+	<input name="execution" type="hidden" value="${flowExecutionContext.key}"/>
 	<fieldset class="buttonGroup">
 		<sf:commandButton id="book" ajaxEnabled="false" action="book" value="Book Hotel"/>&#160;
 		<sf:commandButton id="cancel" ajaxEnabled="false" action="cancel" value="Back to Search"/>