Added city req timeout, removed notify badge