Add loading in explore and bugs fixed