- Fix incorrect usage of query variable.
- Fix potential bug with mutable keyword argument