Ensure imprecise search results are sorted.
Minor consistency tweaks.
Use relative imports to clarify where we're importing from.