Regex tweaks to fix FB and G+