Reinstate John's fixes to solrdocument

Back to the way it was at commit:
3894a838e97a036e9f17464181aabff0b38e1cbb