WIP Restricted areas by type (fixes #961)