Partially reverted previous commit (IDs still needed for toggle more/less)