Update entity location properly