fix search and monitor bugs