Updated to move tags into post-date line