Fixes #137

Removes lazy="joined" on routes into subnets. Instead, groups routes in
explicitly when necessary.
Merge pull request #138 from Cerberus98/master

Fixes #137
Fix related to 5702b7, db_api related tests