Refactored to incorporate additional values in Demographic view.  Updated database ('_' -> ',').