Added better fluid pipe filtering