Update handling of dynamic and download index fields (should use on instead of true)