Imran | BSHR-97 | validation rules fix