CAP-1754 fix of polling and criteria storage