Simplified & improved text retrieval