Fix Category Controller, Also fix bug where it took too long.