Fix region code searching / loss of region code