more bookmark fixes