[FIX] More elegant data clean before storage
[FIX] Bad regex for licence validation