Fix bug for one selected city

Re fix bug in two other functions
Update files for demo