BACKLOG-5062 , BACKLOG-5063 : use condition for filtering