Improve logic of blocking calls to feeds manager from router