Add support for Empty values in query result