Feature/api queries stars

:+1: