added indicate loader and fix long loading
fix merge