refactoring to make named path & query composing more convention driven