fixed #26; removed QuerySetEvent* classes