Fixes from Alan's code review.  Fixed bug where solr query processor is not getting unserialized properly.