Improvements post code-review

* constants are constant
* database stores either 1..N or null for organization
* development version of underscore included