[alt] Changed to use Single instead of Query::single where possible

[alt] Changed to use Single instead of Query::single where possible #42