Fix empty themes in result