Fix matcher for OKRES and NAME.
Add ids of cities to database.