BI-248 Fixed categories