(fix) fabricon and refactor so url logic is in one location