Substring query result limit & more generic settings persistence