fixed some javascript/started more comprehensive search