Order fix and search fix for modules