#1406 #1403 fix search types and move Search to Carma.Model