Added support for storing keywords in URL