Fix skills by skill type scope

I am wondering why the previous scope is working on production, it shouldn't.

I think my proposed code is the right way of doing this kind of filtering.