Use correct field to match on perms.
Add extra views etc.