Hackish fix for several bugs by rewriting URL checker.