new {{geocode*}} shortcuts instead of {{nominatim*}} ones

slightly changed output for {{geocodeId}} and {{geocodeArea}} shurtcuts
in QL mode (no semicolon at the end of produced code) for better usabilty.