Moves filters around to address some issues with #85