Fix filtering factory metrics by org-id and affiliate-id
Fix filtering factory metrics by org-id and affiliate-id

R-Brain/codenvy,codenvy/codenvy,codenvy/codenvy,R-Brain/codenvy,codenvy/codenvy,codenvy/codenvy,R-Brain/codenvy,R-Brain/codenvy,codenvy/codenvy,codenvy/codenvy,R-Brain/codenvy,R-Brain/codenvy