Add seach enable/disable support
Minor improvements