Fix project issue and Improve filter view