Search and Other Improves