Moved the source filtering up front, again