Merge "Fix SearchAction parceling error"