Business & farm

I have a similar problem.  The asset is a building purchased and in service end of 2018 on a farm which we considered single use but after talking with tax help said it does not qualify for single use.  It was classified as Other and we took the bonus SDA of over $40K.  We made improvements in 2019.  I was told to amend last years return and classify both as Non-residential real estate.  Is this the correct path?  We're a little concerned about whether or not form 3115 is necessary or if we can just leave it.  TT did not show any errors after the review and low risk of audit.  Thanks in advance for your help.