Fixed bug which caused sorting to remove other search parameters.  Sorting now has its own form controller.  Changed sortOrder search state field to sortNormalOrder to better reflect its usage.  Removed leftover references to sortOrder as a standalone parameter