Added "None" option for neighborhood association