Feature/api queries stars

Of course you are right. I will change it to something else...