Reverted all query api changes