Pushed changes in different controllers

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>
Pushed changes in different controllers and in search

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>
Pushed changes in different controllers and in search fixing dem merges

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>