some modifications to search