Fix ElementList to consume the entire context