fix picking/unpicking mapper states; batch query support for more efficient polling; fix double polling

Author: cyruszhang