Url query todos and editorial fixes in API