Feature/api queries stars

Yeah... :) but I really don't know what to do about it unless we make some changes to our authorization workflow. Any suggestions?