Removed use of unsupported NA in query