Performance Branch

address a few items outlined in the performance filter: https://kaltura.atlassian.net/issues/?jql=labels%20=%20Performace