Change search to partition