Rearrange for upcoming search utility