Improve populate cmd search