Added more search functions, better error handling for model library