Merge pull request #3 from 30x/database-fix

Should use current snapshot database for data_scope