Fixed directory filtering.  Folders still need to move to the top.