[WIP] Feature/api queries stars