Fixed various issues in Crawler Service