Queries : role base query restriction fixes added

Merged Vikram Ingawale requested to merge vi_Queries_rolebasefixes into devbranch