EDOC-1143: Change compare rules