Correct return values of get_by functions