Copied dashboard speedup changes from checkin 51ee5bb785 and added handling for failed glob