Major Bug fixes related to category import