Added a first pass data search controller #WEB-4488