Simplify and refactor link getting functions to return full url query