Some fixes imn url changer