Full revamp with multiple selections allowed and Smart-Find