search switched with contains
null fixed