Strip out more city text and prevent empty charges