better bookmark support