Clean up search polling

Fixes #29