Fixed more properties to work with the new encoding of subrelation