Improved Expert Search

Created 2 different files so as to avoid last minute conflict