More formatting updates and return Google search terms versus full URL