Refactor endpoints to de-ambiguate POST and GET targets restfully