pagination and better search indexing added