City parser improved