Fix NPE & substring problem
Remove XMLTransient & add param type in entities list