LPS-34320 Prevent bug with advance search and status