diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index bf22b8814..7814b30f7 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -42,13 +42,13 @@ crop_page_title_with_name = Crop image for {0}
 current_photo = Current Photo
 upload_photo = Upload a photo
 replace_photo = Replace Photo
-photo_types =  (JPEG, GIF or PNG)
+photo_types = (JPEG, GIF or PNG)
 maximum_file_size = Maximum file size: {0} megabytes
 minimum_image_dimensions = Minimum image dimensions: {0} x {1} pixels
 
 cropping_caption = Your profile photo will look like the image below.
 cropping_note = To make adjustments, you can drag around and resize the photo to the right. \
-                When you are happy with your photo click the "Save Photo" button.
+When you are happy with your photo click the "Save Photo" button.
 
 alt_thumbnail_photo = Individual photo
 alt_image_to_crop = Image to be cropped
@@ -69,7 +69,7 @@ imageUpload.errorFileTooBig = Please upload an image smaller than {0} megabytes.
 imageUpload.errorUnrecognizedFileType = ''{0}'' is not a recognized image file type. Please upload JPEG, GIF, or PNG files only.
 imageUpload.errorNoPhotoSelected = Please browse and select a photo.
 imageUpload.errorBadMultipartRequest = Failed to parse the multi-part request for uploading an image.
-imageUpload.errorFormFieldMissing = The form did not contain a ''{0}'' field." 
+imageUpload.errorFormFieldMissing = The form did not contain a ''{0}'' field."
 					
 #
 # User Accounts pages
@@ -84,28 +84,28 @@ last_login = Last Login
 add_new_account = Add new account
 edit_account = Edit account
 external_auth_only = Externally Authenticated Only
-reset_password =  Reset password
+reset_password = Reset password
 reset_password_note = Note: Instructions for resetting the password will \
-                    be emailed to the address entered above. The password will not \
-                    be reset until the user follows the link provided in this email.
+be emailed to the address entered above. The password will not \
+be reset until the user follows the link provided in this email.
 new_password = New password
 confirm_password = Confirm new password
 minimum_password_length = Minimum of {0} characters in length.
 leave_password_unchanged = Leaving this blank means that the password will not be changed.
 confirm_initial_password = Confirm initial password
 
-new_account_1 = A new account for 
+new_account_1 = A new account for
 new_account_2 = was successfully created.
 new_account_title = new account
 new_account_notification = A notification email has been sent to {0} \
-                with instructions for activating the account and creating a password.
+with instructions for activating the account and creating a password.
 updated_account_1 = The account for
 updated_account_2 = has been updated.
 updated_account_title = updated account
 updated_account_notification = A confirmation email has been sent to {0} \
-                with instructions for resetting a password. \
-                The password will not be reset until the user follows the link provided in this email.
-deleted_accounts = Deleted {0} {0, choice, 0#accounts |1#account |1<accounts}.
+with instructions for resetting a password. \
+The password will not be reset until the user follows the link provided in this email.
+deleted_accounts = Deleted {0} {0, choice, 0#accounts|1#account|1<accounts}.
 
 enter_new_password = Please enter your new password for {0}
 error_no_email_address = Please enter your email address.
@@ -126,8 +126,8 @@ view_all_accounts = View all accounts
 view_all_accounts_title = view all accounts
 
 new_account_note = Note: An email will be sent to the address entered above \
-                notifying that an account has been created. \
-                It will include instructions for activating the account and creating a password.
+notifying that an account has been created. \
+It will include instructions for activating the account and creating a password.
 
 initial_password = Initial password
 submit_add_new_account = Add new account
@@ -177,22 +177,22 @@ first_time_login = First time log in
 create_account = Create account
 
 cant_activate_while_logged_in = You may not activate the account for {0} while you are logged in as {1}. \
-                Please log out and try again.
+Please log out and try again.
 account_already_activated = The account for {0} has already been activated.
 
 cant_change_password_while_logged_in = You may not reset the password for {0} while you are logged in as {1}. \
-                Please log out and try again.
+Please log out and try again.
 password_change_not_pending = The password for {0} has already been reset.
 password_changed_subject = Password changed.
 account_no_longer_exists = The account you are trying to set a password on is no longer available. \
-                Please contact your system administrator if you think this is an error.
+Please contact your system administrator if you think this is an error.
 password_saved = Your password has been saved.
 password_saved_please_login	= Your password has been saved. Please log in.
 
 
 please_provide_contact_information = Please provide your contact information to finish creating your account.
 first_time_login_note = Note: An email will be sent to the address entered above notifying \
-                that an account has been created.
+that an account has been created.
 first_time_external_email_html = @@file files/accountFirstTimeExternal.html
 first_time_external_email_text = @@file files/accountFirstTimeExternal.txt
 
@@ -201,7 +201,7 @@ myAccount_confirm_changes = Your changes have been saved.
 myAccount_confirm_changes_plus_note = Your changes have been saved. A confirmation email has been sent to {0}.
 email_change_will_be_confirmed = Note: if email changes, a confirmation email will be sent to the new email address entered above.
 #email_changed_subject = "Your VIVO email account has been changed.");
-			
+
 who_can_edit_profile = Who can edit my profile
 add_profile_editor = Add profile editor
 select_existing_last_name = Select an existing last name
@@ -223,14 +223,14 @@ error_password_mismatch = Passwords do not match.
 
 logged_in_but_no_profile = You have logged in, but the system contains no profile for you.
 unknown_user_name = friend
-login_welcome_message = Welcome{1, choice, 1# |1< back}, {0} 
+login_welcome_message = Welcome{1, choice, 1# |1< back}, {0}
 external_login_failed = External login failed
 logged_out = You have logged out.
 
 insufficient_authorization = We're sorry, but you are not authorized to view the page you requested. If you think this is an error, please contact us and we'll be happy to help.
 
 #
-# "partial" individual templates ( /templates/freemarker/body/partials/individual ) 
+# "partial" individual templates ( /templates/freemarker/body/partials/individual )
 #
 manage_publications = manage publications
 manage_grants_and_projects = manage grants & projects
@@ -304,7 +304,7 @@ search_index_not_connected = The search index is not connected.
 failed = failed
 check_startup_status = Check startup status page and/or Tomcat logs for more information.
 search_indexer_idle = The search indexer is idle.
-most_recent_update = The most recent update was at 
+most_recent_update = The most recent update was at
 rebuild_button = Rebuild
 reset_search_index = Reset the search index and re-populate it.
 preparing_to_rebuild_index = Preparing to rebuild the search index.
@@ -501,6 +501,18 @@ restrict_logins_mixed_caps = Restrict logins
 site_information = Site information
 user_accounts = User accounts
 
+#
+# search controller ( PagedSearchController.java )
+#
+error_in_search_request = The search request contained errors.
+enter_search_term = Please enter a search term.
+invalid_search_term = Search term was invalid
+paging_link_more = more...
+no_matching_results = No matching results.
+search_failed = Search failed.
+search_term_error_near = The search term had an error near
+search_for = Search for ''{0}''
+
 #
 # search templates ( /templates/freemarker/body/search )
 #
@@ -518,12 +530,12 @@ page_link = page link
 next_capitalized = Next
 
 #
-# shortview templates ( /templates/freemarker/body/partials/shortview ) 
+# shortview templates ( /templates/freemarker/body/partials/shortview )
 #
 view_profile_page_for = View the profile page for
 
 #
-# menupage templates ( /templates/freemarker/body/partials/menupage ) 
+# menupage templates ( /templates/freemarker/body/partials/menupage )
 #
 browse_page_javascript_one = This browse page requires javascript, but your browser is set to disable javascript. Either enable javascript or use the
 browse_page_javascript_two = to browse for information.
@@ -537,14 +549,14 @@ browse_all_public_content = You can browse all of the public content currently i
 browse_all_content = browse all content
 
 #
-# partial templates ( /templates/freemarker/body/partials ) 
+# partial templates ( /templates/freemarker/body/partials )
 #
 no_content_create_groups_classes = There is currently no content in the system, or you need to create class groups and assign your classes to them.
 browse_capitalized = Browse
 browse_by = Browse by
 
 #
-# partial account templates ( /templates/freemarker/body/partials/accounts ) 
+# partial account templates ( /templates/freemarker/body/partials/accounts )
 #
 delete_button = Delete
 accounts = accounts
@@ -552,7 +564,7 @@ accounts_per_page = accounts per page
 update_button = Update
 
 #
-# pagemanagement templates ( /templates/freemarker/body/pagemanagement ) 
+# pagemanagement templates ( /templates/freemarker/body/pagemanagement )
 #
 title_capitalized = Title
 type_capitalized = Type
@@ -573,7 +585,7 @@ use_capitalized = Use
 to_order_menu_items = to set the order of menu items.
 
 #
-# menupage templates ( /templates/freemarker/body/menupage ) 
+# menupage templates ( /templates/freemarker/body/menupage )
 #
 page_not_configured = This page is not yet configured.
 implement_capitalized = Implement
@@ -584,10 +596,10 @@ no_html_specified = No HTML specified.
 page_text = page text
 
 sparql_query_results = Sparql Query Results
-no_results_returned = No results were returned. 
+no_results_returned = No results were returned.
 
 #
-# manage proxies templates ( /templates/freemarker/body/manageproxies ) 
+# manage proxies templates ( /templates/freemarker/body/manageproxies )
 #
 operation_successful = The operation was successful.
 operation_unsuccessful = The operation was unsuccessful. Full details can be found in the system log.
@@ -608,7 +620,7 @@ selected_profiles = Selected profiles
 save_profile_changes = Save changes to profiles
 
 #
-# page partials templates ( /templates/freemarker/page/partials ) 
+# page partials templates ( /templates/freemarker/page/partials )
 #
 copyright = copyright
 all_rights_reserved = All Rights Reserved.
@@ -635,7 +647,7 @@ menu_item = menu item
 version = Version
 
 #
-# widget templates ( /templates/freemarker/widgets ) 
+# widget templates ( /templates/freemarker/widgets )
 #
 individual_name = individual name
 vclassAlpha_not_implemented = vclassAlpha is not yet implemented.
@@ -656,7 +668,7 @@ confirm_password_capitalized = Confirm Password
 already_logged_in = You are already logged in.
 
 #
-# lib templates ( /templates/freemarker/lib ) 
+# lib templates ( /templates/freemarker/lib )
 #
 statistics = Statistics
 
@@ -679,7 +691,7 @@ add_label_for_language = Language
 unsupported_ie_version = This form is not supported in versions of Internet Explorer below version 8. Please upgrade your browser, or switch to another browser, such as FireFox.
 
 #
-# edit templates ( /templates/freemarker/edit and edit/forms ) 
+# edit templates ( /templates/freemarker/edit and edit/forms )
 #
 edit_capitalized = Edit
 add_capitalized = Add
@@ -748,7 +760,7 @@ label = label
 no_classes_to_select = There are no Classes in the system from which to select.
 
 #
-# vitro theme templates ( /themes/vitro/templates ) 
+# vitro theme templates ( /themes/vitro/templates )
 #
 powered_by = Powered by
 javascript_ie_alert_text = This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser.
@@ -764,7 +776,7 @@ search_vitro = Search VITRO
 filter_search = filter search
 
 #
-#  custom form javascript variables ( /templates/freemarker/edit/js) 
+# custom form javascript variables ( /templates/freemarker/edit/js)
 #
 select_an_existing = Select an existing
 or_create_new_one = or create a new one.
@@ -789,7 +801,7 @@ october = October
 november = November
 
 #
-#  miscellaneous javascript variables ( webapp/web/js) 
+# miscellaneous javascript variables ( webapp/web/js)
 #
 select_editor_and_profile = You must select a minimum of 1 editor and profile.