Move file matching into its own method and call from create action as well