Filter fixes in analysis view