More Filter Box Changes