For clarity, I decided to create a new topic for this subset of this issue - “wandering fix”.
My apologies to anyone following this thread.