(GFW-350) Updated vatiable view validation