Refactor query operations parsing
Rename Map to MapOperation

- In order to avoid confusion with the collection