fixed searching to reflect new models
Merge branch 'timesteps'