Added Google Maps address filtering
Changed form a bit