validations in finding, and few changes