Added url annotation in <bookmark> tag
Better active window tracking