More fixes for BookmarkWarp.  Need to complete undock before attempting an entity lookup