Tried to fix search annotations