merge QueryServiceEventType and QueryServiceEvent into single file