* Add address to router query options. Drop Query interface for QueryOptions * Cleanup isMatch function * Update network proto