Tweaked filter.  Added more logging.