Fixed queries to get null aliases