Use standard analyzer for now, fix some mapping typos