additional filtering for value formating

Change-Id: I14488f8868ffaec6a5a6910c623acb2d250d8a02