Add wrapper for field, seperate organization to single field.
Correct wrong if.
Add author idx again...
Merge pull request #1 from jimyhuang/master

Add 2 new field for better index