Added pseudo many-to-many via category index

Additional cleanup as well