Updated validators to support Non-JS version of search.