Link fixes for new record tracking