Merge "Make "search by number" function work" into gingerbread