Changed handling of rdo/city/barangay accruing to new way of coding those fields
Also cleaned up the notes and added them as extra field in the listings