Finished map loader
Solved filter conflict