Domain fixes for ID and JSON output