Fixes for Jump to Last Unwatched

This is an older pull request to the original version.  I have verified
that it works, but I may wind up changing a few things later