Added search return constraints