[Issue #188] [WIP] adds appropriate returns to export actions