changed data view to include filters

I have also removed unnecessary variable(boolean) from map view