Reorganized where on_add handles fixing vocabulary