Hopefully fixed filtering bugg.