Changed query handler name