cp: changed to better method of AG bookmark handling