Fixed query from last commit