Added functionality to search based on Organization