Added loader and fixed for urls with numbers