* Move best_containing from Client to Backend

* Add comma for clearer diffs

Co-Authored-By: André Silva <[email protected]>