minor changes: changed user-generated id delimiter field so that it mantains state; added hyphen to user-generate tag in messages.properties