engine: Clean up URI building code a tad
engine: Clean up URI building code a tad

Remove duplication between fix / query, to make it easier when we add
support for records from shards.

endlessm/eos-knowledge-lib,endlessm/eos-knowledge-lib,endlessm/eos-knowledge-lib,endlessm/eos-knowledge-lib