Moved subscribe and unsubscribe to the ModelRouter and fixed a bug witht he updated call