Added better search capabilities.