Add show all button and by default hide stores
Fix merge conflict