Fix problems with reloading of data and try to ensure we function when primary is unreachable