Stop testing for category ID - just return output if set

Poor logic begets poor logic