Add ETA support
Update using sys variable instead of constant
Fix Factory path was wrong for deeper structure
Fix restarted thread was started immediately if index was lower then current running group