Added modeldir option to GenericSearch. I thought I had done that already...