fix for nullable content in query