Adding: highlight of clicked feature on state maps; fixing some logic