adding modal filtering changes back in. Still bug-free (on enrico).