Re-implemented search for completion
Pagination limited correctly