Made quick edit understand extra nodes.
Generic event filter is now actually generic
moved code around a bit