City Council to tackles hotel tax, short-term rentals