simplify the query
implementation
#121
+192
−178
Merged
query
implementation
#121