LPS-37294 Fix bugs for Staing (polls and more)