Fix #13: Refactor search URIs