Improve/expand workout and program filters on both machine and app