Updated mappings to get fields out of 'meta' and normalized some fields so cross-type searching is easier.