Reworking view and rule for export