adding WayQuery to __init__, fixing way query
adding exception class
slight refactor of map query, adding way query