#523 Added key tags functionality