*8561* Fixed missing empty features return