Rezoning approved; final decision rests with city council