Fixed queryes and data are now shown on mappage
Updated todo list