We don’t know what those shortcuts are doing so that kind of limits the quality of any advice, but you could just try the two approaches you listed and see what the results are for your shortcuts. Presumably it will only take you a few minutes to test both approaches and check the results.