Added exercises filtering in monitoring (+ small fixes)