BUG FIX: Categories Selection