Alter selfurlnoquery function