Songs list classification not syncing with Zune

Hi,

I am using a Nokia Lumia 800 for about 5 months now. I am generally impressed with platform an have never experienced a problem as such.
I have the following OS and firmware versions:

OS 7.10.8107.79
Firmware: 1600.2489.8107.12072 (forced update, everything is working normally)

The problem:

My phone's music hub is not showing the songs the way they are grouped in Zune. I made some changes to the music files in zune(updated file information and genres) and then synced my phone with the PC. Although everything was normal before doing this, it is now showing genres that currently don't exist actually in Zune.

I hvae some 8 genre categories in Zune whereas there are 11 in the phone. Although the original categories exist the ones extra are the ones that i have deleted form Zune and it is for some reason not getting updated.

Please Suggest !!!!