Replace hash tag constructs
Cosmetics
File upload fix