Common Filter - Bug fixes