Add entities to the correct chunk if available and added to the wrong chunk.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>