Event query improvements.