Undo filter change
Local Resolve improvements