Filter DataItems with suitable way.
am: da6fcfd8a1

Change-Id: Ie72e444c9b2a3e91adcb6d8a6b67e043cc0daaf3