Navigation - subscriber (cleans cache), small refactoring, cleanups