Extracted filtering control

Also added notifications and invitations.