Vishnu | #2129 | Adding Underlying data and changing query based on dev box testing