Events Fix, Queries Fix