Fix + execute_search function