Final changes for 'Bad URL' detection system