Changes made by Chuck Catron (charles.catron@gmail.com).

Cleaned up filtering