Improvement: Only display Location when not empty