Pull Request from Jelle and minor updates

Pull Request changes (Thank you Jelle!):

1. Passing the return entity as Entity and not an object (no need to create dummy object)
2. Retrieve sort objects via association with XPath object. So you don't have to pass the list

Other updates:

1. Increase query attribute size to unlimited for Ben