added more fixes for multiple home teleport