*Cleanup & Began new query api