More work on auto bookmark logic