Redesigning combos mechanism to reduce queries and show by file correctly.