[FIX] add contract tags, fix customer value