Fix finder methods of Collection