Changed intermediary to remove params with empty values