refactor bookmark rest api