Remove location from model and put back js modified by @rizarsyi