Added filter for names

Change-Id: I20b530af0ac0dda01dd154709fad18920a4cd1fb
Merge "Added filter for names"