Fix copy and paste finally
Fix tag matching regex to handle things with dots in.
Remove GWT javascript hack as it was not required in the end