made sure to only pull shortcuts in initial where statement