Minor fix to stop name and address duplication
Allow unicode bullets as separators
Fix for multiword states