Fixes merge issues with filtering