Updated search to be easier to use