filter selected button and big improvements on map filtering