Fix the categies and added tags to sample