Some changes for advanced_search