Bug fixes for Sidewinder filter