a few more duplicated endpoints handled