fix/hack remaining filter and analysis issues