refactor finders in spianch:merge_request.feature