fix to grab from current uri