Also added constraint on the search