Prevent cyclic chain over entities (#229)
Improve search end point for test batches(#229)