Changed search to wildcard search

Change-Id: I061e08450c5a6a73abba7d1565acdedeb41cc109