changed the implmentation to use with the path field enabled sites too