Refactored views as preparation for subscriptions
Removed wrong filtering