QueryBuilder fix og events construction