Nawqaan 416

Fixed remaining issues from the switch to the new sites shapefiles.