Fixed some issues on Add terms