better search with context