Merge "Fix search form overflow"