It handles both the cases just like `:index` so why change it? Or do you want me to do the same with `:index` i.e. change it to the new implementation only when the collection option is present?