Query rework
bookmark print rework