Minor changes in handling # tags