[Refactor] Simplify code
[Feature] Improve finding of "best match" for directional navigation