Increased timeout on search keyup; added more keyterms; cleanup