updated query grammar and squashed bug related to unset/remove action