Search Form Design Change & XQuery Script Update