fix(client): don't request unneded sections from server; refactor(router): clean-up