updated database_selector. #358