Smart Search v1.3 - Final Commit Before QA