Fixed bugs with token '<' and [object Object]