Polish support, click capture improvement