[ORB-261] fixed validation rules based on data from Tim