Added quotes to fix user selection
Merge branch 'database'

Merging changes.