Adjust index for bookmark to add owner and add index for history table