Filter View Bug Fixes