fixing selection bug on city and adding templates