Bug/fixes for filters