ADD: seach question and minor cleanup