breaking stuff as usual
updated query methods to accept name only