Fix NPE when addon value is null
Map "slug" values as not indexed