improve toolbar data parsing