Basvi - Bug fixes

policy no and existing policies terms