remove hibernate query and add namedquery
change Organization types