Reorder directory filter more logically