Added better history searching