Revert "Fixed a bug. From list to single."

This reverts commit f31f7dc570f969de1aeeb19ed58f270c5d1c963a.
Fixed a bug. Should use Option but used List.

Adjusted to a singple option result from reuse findAllBy code using list.