Updated regex (again) for citizen/size