Feature/api queries stars

oh la la… but :+1 for nicely readable formatting.