Fix adding jobset inputs
Fix same system inputs