fix plural and embeded