[WIP] Feature/api queries stars

@mtakac #1472 should make this change unnecessary