Update search to be more accurate