Clean up default config add additional XPATH