fixed few errors
added convert to premai pol and risk ids
to upper chase