API change. Add query last