Added annotations mechanism and improved the UX of the disable geoip flag