Filter update and minor changes