update for new layout and fix urls with punctuation