Undo a before call
Fix query