7 Years Ago
Api query refactor