Controversial property plans will include Maryville fire station; no rezoning until plans are completed