naming
Fixed all NRE's: we can query!