Fix bookmark support