done with main api handler refactoring for all datasets