Fix collection usage for find and modify