Cleanup the address upfront instead of after search