updated database_selector. #358
started addressing issues #359, #360
database_selector fixes. #358
Merge branch 'release/v2.0.4' into develop