Fix the "current category" to work in both 1.5 and 1.6