Fix location card phone bug and infinite loop in location checks