Update for RethinkDB 1.8
Fix export