HUM-1021 : couple small sql changes
HUM-1021 : couple small sql changes

corystone/hummingbird,creiht/hummingbird,nadeemsyed/hummingbird,troubling/hummingbird,nadeemsyed/hummingbird,creiht/hummingbird,corystone/hummingbird,troubling/hummingbird