Fixes

fixes due to wireframes and filter changes