add removing Nones from query