Added some catches for states and cities