Bugfix: More robust Location accordion handling.