Fix parser for keys including ID in it's name