updates to Element, Query and String