Major changes to the filter identification routine - still problems.

Just and "end of day" commit