Add fields for indexing (bug 1066371)