Add bookmark query host, add tests for host querying