Code cleanup, give ability to automatically create term from server term name in term mapping