improved place_of_worship detection and naming