[WIP] Feature/api queries stars

@mtakac tests?