refactor(rest) change order of query, name