Add support for other queries needs handling null