Fixes #526

Added language check to folder ordering .