Include shortname in community search
Add some account restrictions