Re-introduced clear search button, cleaned up naming,replaced filter type