small cleanup, more filters on shifts