Fix URLValidator, make features a bit more stable.