fixes
Merge pull request #1 from AdOnWeb/nosql-fixes

fixes for mongodb