Improve entity name, fix a bug on validate url and save the job