CORE-369 improvements on existing list and adding attr categories