don't add null categories and adding the ability to change remove the session