Minor config and search changes