property minor refactor, and add clear search