Some more changes for the opt filter