Fixes for select city~