Choosing category for criteria is now better