Further filter improvements