Fixed - api server -final version
Signed-off-by: bplotka <bwplotka@gmail.com>