Add keywords to index fields
Fix some NPE problems with POM analyze