added changeset [480] to the branches
Added changeset [476] also to branches
Added missing search/search_convert.php