Rename relative query methods, improve loop