Refactor find_by method, make membership check more efficient