NHMRC crosswalk functionality, some bugfixes