feat(promises): some query interface refactoring