It finishes updating query api. Resta complete all interfaces to achieve coherence.
English rename some variables to more descriptive names.