refac: review and refactor API#428

fishonamos wants to merge 2 commits intohotosm:develophotosm/fAIr:developfrom

fishonamos:fa-apifishonamos/fAIr:fa-apiCopy head branch name to clipboard