some search issues && action corrected