Added logic for building items in Category order.