Merge "Fix docker search"