Made auth tokens optional for non-authorized api calls
Reordered api args to fix syntax error