Updated view, implemented filtering