Merge "Remove undocumented and unused searchx parameter"