Improve P/R by better separation of hierarchic conditions