Highlighting and rearrangement on Search builder