[#73321840] Refactored the find_by method