[#1821] [#1723] fix pet counters (incl for member modals)