Added Searching functionality on data layer