more tweaks for rethinkdb