Closes #379 - Moved library search.