Adds domain to search key and fixes some small issues.