partial fix of local caching and displaying