Fixed so return values have id
Some edits to add support for admin canx leasons