Added router, viewport and basic collection filters