Fix deprecation of find_or_create_by matches