handle keycloak fluent interface and small polish