diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
index 9528cfeb..244447a8 100755
--- a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
+++ b/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
@@ -2,8 +2,6 @@ package org.springframework.webflow.samples.booking;
 
 import java.io.Serializable;
 
-import org.springframework.util.StringUtils;
-
 /**
  * A backing bean for the main hotel search form. Encapsulates the criteria needed to perform a hotel search.
  */
@@ -65,12 +63,6 @@ public class SearchCriteria implements Serializable {
     }
 
     public String toString() {
-	StringBuffer criteria = new StringBuffer();
-	if (StringUtils.hasText(searchString)) {
-	    criteria.append("Text: " + searchString + ", ");
-	}
-	criteria.append("Page Size: " + pageSize);
-	return criteria.toString();
+	return "searchString = '" + searchString + "'";
     }
-
 }
\ No newline at end of file
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web-application-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web-application-config.xml
index 51cb1dfe..4f52e22d 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web-application-config.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web-application-config.xml
@@ -18,7 +18,7 @@
            http://www.springframework.org/schema/faces-config/spring-faces-config-2.0.xsd">
 
 	<!-- Activates annotation-based bean configuration -->
-	<context:annotation-config/>
+	<context:annotation-config />
 	
 	<!-- Instructs Spring to perfrom declarative transaction managemenet on annotated classes -->
 	<tx:annotation-driven />
@@ -31,7 +31,7 @@
 	<!-- Executes flows: the central entry point into the Spring Web Flow system -->
 	<webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry">
 		<webflow:flow-execution-listeners>
-			<webflow:listener ref="jpaFlowExecutionListener" criteria="*"/>
+			<webflow:listener ref="jpaFlowExecutionListener" criteria="*" />
 		</webflow:flow-execution-listeners>
 	</webflow:flow-executor>
 	
@@ -47,7 +47,7 @@
 	</bean>
 
 	<!-- Configures the Spring Web Flow JSF integration -->
-	<faces:flow-builder-services id="facesFlowBuilderServices"/>
+	<faces:flow-builder-services id="facesFlowBuilderServices" />
 
 	<!-- Drives transactions using local JPA APIs -->
 	<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
@@ -58,7 +58,7 @@
 	<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
 		<property name="dataSource" ref="dataSource" />
 		<property name="jpaVendorAdapter">
-			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"/>
+			<bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
 		</property>
 	</bean>