Fixes #1, tested working; also add index:true on date fields