Tested OK.  Need to reinstate blob index handling.