added more triggerkeys and removed unused variables in hasHints/getQueryInfo