Pulled the category selection into helper