Fix entity loading only loading one enity