Changed categories and criteria handling