updates to fix addresses

addresses can now be added to anything, I think this is how the queries
always intended it to be.