Fixing filtering, some changes in view.