Satya - Bug fixes

Error view controller size and query changes