Added better filtering and added fetchOne to collection