Improved filtering with intersection now working.