Now time-out handler for search task is a static class. Also Clean Up