Extract addRecordViewsToScope and use both for new and edit record