Expand URL Structure to handle full XPath queries
Fix some quirks when editing entries, update README