Issue #154: corrections

Removed storing parameters to HashMap, joined buildAndExecuteQuery with
applyFilter. Minor corrections.