make sali warning even more clear
fix filtering bugs