city model, token interceptor fix