Fix more filters that will fail on xscsi names