Load bars adapted
cleanup code and better filtering
Clean names for refs