Search fix. Add search validation and error message.