Fix for 500 & urls