fix view filename extraction for watching
clean up clients map being used for refreshing from server
refactor client registration for auto refreshing