change command_find helper interface