Onomastica cleanup
tagset fixes