Ok, I think I've restored the stashed changed and merged in the filtering.  There may be an unnecessary model change that I may have to re-remove.