update search
update search 2
Alex merged with master