Fixed some missing return values and added database change routing to right shard.