moved ng-ifs into filter for shifts