Fix for saving page so page reloads to the same url including tags
Code cleanup
cleanup