add support for promises in case of onNoDataFound and onSuccess
merge