Various fixes for filters