Refactor every scope filter and make it actually work